Skip to content

Conversation

@qdm12
Copy link

@qdm12 qdm12 commented Jan 2, 2025

Why this should be merged

No need to manually update the commit hash of the last auto rename commit.

How this works

It reverse searches the commit from the github bot author and matching the automated commit message.

How this was tested

CI passing

@qdm12 qdm12 force-pushed the qdm12/ci/libevm-delta branch 12 times, most recently from b13b43d to f0c8766 Compare January 10, 2025 10:38
@qdm12 qdm12 marked this pull request as ready for review January 10, 2025 10:47
@qdm12 qdm12 requested a review from ARR4N January 10, 2025 10:47
@qdm12 qdm12 force-pushed the qdm12/ci/libevm-delta branch from a31a804 to 65917f0 Compare January 12, 2025 18:09
Copy link
Collaborator

@ARR4N ARR4N left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your git-fu is very impressive. Thank you; I learnt a lot from this PR.

@ARR4N
Copy link
Collaborator

ARR4N commented Jan 13, 2025

Thinking about this some more, I don't think it's necessary to find the geth commit as all we need is the latest renaming commit. I think the whole thing can be reduced to a single line:

git rev-list --author "github-actions\[bot\]" --grep renam -n 1 origin/main

Then both scripts can be deleted. I haven't checked the exact line above as I'm on my phone, but the general idea is sound IMO. Using "renam" catches both "rename" and "renaming" in case somebody changes it in the future, but probably best to add a comment on that workflow stating that it MUST include it.

@qdm12
Copy link
Author

qdm12 commented Jan 13, 2025

That's great! Although I would keep the grep to the full \[AUTO\] rename Go module + update internal import paths and specify in the job where that string is defined to mirror it, to avoid it catching the wrong commit (github bot might be renaming something else)

@qdm12 qdm12 force-pushed the qdm12/ci/libevm-delta branch from fd517ab to 66e2357 Compare January 13, 2025 12:27
@ARR4N
Copy link
Collaborator

ARR4N commented Jan 13, 2025

That's great! Although I would keep the grep to the full \[AUTO\] rename Go module + update internal import paths and specify in the job where that string is defined to mirror it, to avoid it catching the wrong commit (github bot might be renaming something else)

Let's use "rename Go module" then as it's the shortest string that's specific to what we're looking for.

@qdm12 qdm12 changed the title chore(ci): automate detection of libevm fork base commit chore(ci): automate detection of last auto-rename commit Jan 13, 2025
@qdm12 qdm12 merged commit e2b0abb into main Jan 13, 2025
5 checks passed
@qdm12 qdm12 deleted the qdm12/ci/libevm-delta branch January 13, 2025 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants